From ba9f460f718d7176e76268bbc32e014c47c0e74c Mon Sep 17 00:00:00 2001 From: Iceyer Date: Thu, 3 Aug 2017 16:56:52 +0800 Subject: [PATCH] Fix cannot run test by make check Change-Id: Ife192a0e5b9022ba68bee5185c80fe8bfd2721b9 --- debian/rules | 3 +++ dtkcore.pro | 2 +- tests/dutiltester.cpp | 9 +++++++++ tests/dutiltester.h | 9 +++++++++ tests/main.cpp | 9 +++++++++ tests/tests.pro | 1 + 6 files changed, 32 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index c9ac68c..443c404 100755 --- a/debian/rules +++ b/debian/rules @@ -9,5 +9,8 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_auto_configure: dh_auto_configure -- LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) +override_dh_auto_test: + echo "skip auto test" + override_dh_makeshlibs: dh_makeshlibs -V diff --git a/dtkcore.pro b/dtkcore.pro index 1e7088f..3138b6c 100644 --- a/dtkcore.pro +++ b/dtkcore.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -CONFIG = ordered +CONFIG += ordered SUBDIRS += \ src \ diff --git a/tests/dutiltester.cpp b/tests/dutiltester.cpp index eb0df58..c4ae4d0 100644 --- a/tests/dutiltester.cpp +++ b/tests/dutiltester.cpp @@ -1,3 +1,12 @@ +/** + * Copyright (C) 2017 Deepin Technology Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + **/ + #include "dutiltester.h" #include diff --git a/tests/dutiltester.h b/tests/dutiltester.h index c5e89a8..b785b3d 100644 --- a/tests/dutiltester.h +++ b/tests/dutiltester.h @@ -1,3 +1,12 @@ +/** + * Copyright (C) 2017 Deepin Technology Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + **/ + #ifndef DUTILTESTER_H #define DUTILTESTER_H diff --git a/tests/main.cpp b/tests/main.cpp index 28005f9..0abaecb 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,3 +1,12 @@ +/** + * Copyright (C) 2017 Deepin Technology Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + **/ + #include #include "dutiltester.h" diff --git a/tests/tests.pro b/tests/tests.pro index f26a5bd..f89c599 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -19,3 +19,4 @@ else:unix: LIBS += -L$$OUT_PWD/../src/ -ldtkcore INCLUDEPATH += $$PWD/../src DEPENDPATH += $$PWD/../src +QMAKE_RPATHDIR += $$PWD/../src -- 2.39.5